From fdc01f80afcc1b1b13f9be2eb25847c0887117c0 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Wed, 5 Nov 2014 16:01:28 +0100 Subject: [PATCH] Adwaita: dim GtkPlacesSidebar icons color --- gtk/resources/theme/Adwaita/_common.scss | 23 +++++++++++++++---- .../theme/Adwaita/gtk-contained-dark.css | 8 +++++++ gtk/resources/theme/Adwaita/gtk-contained.css | 8 +++++++ 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index 3d1efb75ca..a30ac2a622 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -2810,20 +2810,35 @@ GtkFileChooserDialog { // Places sidebar is a special case, since the view here have to look like chrome not content, so we override text color GtkPlacesSidebar.sidebar .view { + $_backdrop_selected_fg_color: if($variant == 'light', $backdrop_base_color, $selected_bg_color); // FIXME this should be a general + // color var + color: $fg_color; background-color: transparent; + .separator, + .separator:backdrop { @extend .separator; } + + .image { // icons color + color: mix($fg_color, $sidebar_bg_color, 70%); + + &:selected { + color: mix($selected_fg_color, $selected_bg_color, 90%); + + &:backdrop { color: mix($_backdrop_selected_fg_color, $selected_bg_color, 90%); } + } + + &:backdrop { color: mix($backdrop_fg_color, $sidebar_bg_color, 70%); } + } + &:backdrop { color: $backdrop_fg_color; } &:selected { color: $selected_fg_color; background-color: $selected_bg_color; - &:backdrop { color: if($variant == 'light', $backdrop_base_color, $selected_bg_color); } + &:backdrop { color: $_backdrop_selected_fg_color; } } - - .separator, - .separator:backdrop { @extend .separator; } } diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index 2a1eb1a34c..56b7f68b57 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -3935,6 +3935,14 @@ GtkFileChooserDialog .dialog-action-box { GtkPlacesSidebar.sidebar .view { color: #eeeeec; background-color: transparent; } + GtkPlacesSidebar.sidebar .view .image { + color: #bbbdbc; } + GtkPlacesSidebar.sidebar .view .image:selected { + color: #e8eef5; } + GtkPlacesSidebar.sidebar .view .image:selected:backdrop { + color: #215d9c; } + GtkPlacesSidebar.sidebar .view .image:backdrop { + color: #7b7f7f; } GtkPlacesSidebar.sidebar .view:backdrop { color: #939695; } GtkPlacesSidebar.sidebar .view:selected { diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index 77d2701373..99453bb3c0 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -4096,6 +4096,14 @@ GtkFileChooserDialog .dialog-action-box { GtkPlacesSidebar.sidebar .view { color: #2e3436; background-color: transparent; } + GtkPlacesSidebar.sidebar .view .image { + color: #6b6f70; } + GtkPlacesSidebar.sidebar .view .image:selected { + color: #ecf3fb; } + GtkPlacesSidebar.sidebar .view .image:selected:backdrop { + color: #ecf3fb; } + GtkPlacesSidebar.sidebar .view .image:backdrop { + color: #adafb0; } GtkPlacesSidebar.sidebar .view:backdrop { color: #8d9091; } GtkPlacesSidebar.sidebar .view:selected { -- 2.30.2